From: Kenichi Handa <handa@m17n.org>
Date: Fri, 26 Feb 2010 01:22:23 +0000 (+0900)
Subject: from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7006^2~65
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cece37cef07578df4e91e28cd1f995c79f807f30;p=emacs.git

from trunk
---

cece37cef07578df4e91e28cd1f995c79f807f30
diff --cc src/ChangeLog
index 88d31d734e5,45d8b59618d..7a3d348e490
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2010-02-26  Kenichi Handa  <handa@m17n.org>
 +
 +	* xdisp.c (reseat_to_string): Fix previous change.
 +
+ 2010-02-26  David Reitter  <david.reitter@gmail.com>
+ 
+ 	* nsfont.m (nsfont_draw): ns_antialias_text should be a
+ 	Lisp_Object (Bug#4736).
+ 
  2010-02-25  Kenichi Handa  <handa@m17n.org>
  
  	* xdisp.c (reseat_to_string): Fix previous change (bug#5609).